REF: Address review comments, add deps