Removed unused imports and fixed some typos within comments
Signed-off-by: Alessandro Tundo <alessandrotundo94@gmail.com>