Refactoring, starting work on special forms
implemented 'if'