Coder cleanups