Models syntax cleanup