improved naming and cleanup