Cleanup minor syntax