Further cleaning accordingly to codeclimate