spring cleaning
new-style classes...oops