Fixes some style issues