Changed Reset to be internal
Decorated shorthands
Removed code duplicate
Refactored
Changed internal handling back to list