Mostly cleanup & Javadoc comments