Clean up
Make a class of it!