Updated files to be more in sync with master (regarding syntax)
Updated files to be more in sync with master (regarding syntax)