removing the unneeded class loaders
correcting formatting both in raw source and in the forms