Code cleanup. Stay < 80 columns