Fix some checkstyles. Make CoventionService convert.
Running.

Note: Before review.