Code clean up
Minor changes