Clean up code moved into class