cleanin' up the code