Attempt to enhance code climate somewhat