General code cleaning and prettier printing