Fixes whitespace and tidy