Cleaned up the code and assets