Clean eclipse project setting
Refactor code