rubocop
small refactor
rubocop rules
style corrections
remove obsolete spec helper
refactor code style