refactored SST data structures after code review