Resolved all rubocop and all but 2 rbp warnings