clean up code to make it clear