Code optimization
Code optimization
Add junit tests