Minor code rearranging