Improve performance
Improve performance
Cleanup
Fix comments