Fixed few more code climate issues