Cleaned syntax and structure