- Optimize codes: remove Java internal plus totally
 - Refine comments