improve for code climate