Fix: make some checkstyle corrections