Apply some small changes to improve performance ( slightly )