Cleanup for code climate