Minor fix and restructure