Fixing more code style issues, this is why you shouldn't code late at night