minor arrange
minor changes
removed and reintroducted print order