cleaned up for pub release