Running 1.6.2 - Small Code Clean Up