Move modifications to improve redibility of code