First iteration of code cleaning has been made.