Code clean up in progress