Code clean up, might give performance improvements, can contain bugs