Reformatted source, removed unused classes, 1.2.5 - 1.7.2 compatibility (again), few minor improvements