Revert "Simplified check method"

This made the line to long for rubocop

This reverts commit 55de488e8e82127e313956632570e220470fcc27.
Fixed styling

(fixes rubocop warnings)