remove old code
modify for readability
remove old code