Settings cleaned up, issue with object instantiation