Major kang/clean up by franco-c