Codeclimate attempt 8