syntax and code cleanup
update Kue to 0.8.5