Move and clean code