Codeclimate attempt 10