Moved helper methods into private