Codeclimate attempt 9