cleanup
Code optimization