Neatening up the code before merge to master.