Change to cleaner syntax