Cleaned up code and files