cleanup & restructure