Refactor and restructure code; more random data