Updates with assets. Some code cleanup.