Refactored/Cleaned up in POS