Refactor code, update assets