Cleaned up some rubocop offences