Removed self instantiation and migrated settings to class parameters