update to clean up code