Fixed things according to the style guide