Updated code style settings per https://github.com/tguzik/java-project-template/commit/eb4b05a04e7429e2ba617014ab1a71a4c4250ae2
Removed annotation; renamed few fields.
Reformatted source code.
Fixed unit tests that failed due to field renames.