javadocs and formating :D