some more cleaning.... i suck at this