Removed log and added instances to class