Clean up and coder compliance