Code formating + javadoc