reviewed files with ´rubocop -a´ for consistence