Removed more dependencies and changed method names for consistency.