Language/formatting fixes, and removal of async related concepts