Refactoring
More refactoring
Updated assets