tons of refactoring - cleaning up silly stuff