Fixed typo + a bit of tidy