Cleaning up the code. speeding up load
Speeding up a bit more, adding arrow framework