Cleaned up the base inheritence