neatening up code