Some of my Javadoc was removed while refactoring ... Therefore, I added Javadoc everywhere and fixed formatting/indenting.