Fix code climate issues ...