Cleanup, get functions (todo: initializeWithRawData), unit tests