made better for codeclimate