Refactor

"Refactor early, refactor often"
"Better late than never"