Cleaning up, wrapping in a class