move body of those private methods here, and delete private methods