Fix code climate issues