Fix style issues with code