cleanup & better renaming