updates to clean up code