Some optimization and cleaning