Minor cleanup (suppressed warnings and javadoc)