Always nice to actually import classes
Also fixed minor typos here and there
Formatting