Coder clean-up