Code cleanup and Asset bugfix