Some styling corrections, println and javadoc