Tidy Up Redundant Code