Debug and clean up, syntax that works