*Syntax fixes and cleanup