Removed user of all private methods