Fixed more code climate issues ..