Some style changes and improvements
Merge branch 'develop' of https://github.com/combats/ITA-java into develop