cleaned up #37