Refactoring

Adjusted define-syntax/parse