Remove duplicate logic (refactoring)
Add codeclimate gadge [ci skip]