Check Condition and basic code clean up