Removed unused assets
Cleaned up further code and conformed to one style guide