Bugfix for filename <-> class <-> method ordering. Some code cleanup.