Codeclimate attempt 7