Refactored If
First Full refactor done