Removed extras, refactored