Reformatting, cleanup of messy code.
Possibly more lines added then removed?
Start removing of unused fore and reformatting of it.