cleaned up help advised by codeclimate