re-arrange, make comments not out of order