* added code style
* added some javadoc
* solved warnings