Assignment 3 implemented: Clean up still required