Improve responsiveness
Reorganize naming
Cleanup