Code clean up, rename