more updates to clean up code