Finished SwissProt and refactored a bit.