fixing checkstyles

Fixing some issues with checkstyle