Cleaned up the working directory a bit