Cleaning up some and double checking that public hasn't already been added to assets.