Codeclimate attempt 6