robucop warnings
refactoring