Reviewed all

  - Docs
  - clean up methods