making some changes back, code climate is dumb: