first round of changes based on PR comments
removed testing functionality