Fixing some code climate problems