Move around messy code