PR for code review

Also deleted na this class po.