Checkstyle fixes
Added argument checks