Cleaned syntax