Little bit o memory optimization