Dropped unnecessary object references
Minor refactoring