Refactored Syntactic Form and added stubs for statements