Added source code assets, cleaned up code