more cleaning!
Ran code cleanup, hope for the best