Added object based Checks and Freshens for #2 and cleaned small pieces of code