Cleanup of some code smells raised by code climate