Refactor - Lots of speed improvements