Reorder the deps and better comments