Cleanup code and tweak route address