Minor code cleanup - checkstyle