[MRG] Addressed comments