clean up - minor styling and test cleanup