Cleanup and simplification per feedback