Fixed: Cleaned up a bit.