Remove a println and arrange things for greater clarity