Cleaning up pt.2