Reformatted comments to suit for javadocs, removed deprecated methods cluttering the code