pretty much done with syntax cleanup