Switched major syntax into lisp-style