Refactor, make it faaasst