Minor fix and rearranging