Make some checkstyle corrections

Make some checkstyle corrections for better code readability.