fixed code style, minor JavaDoc additions