cleaning up, renaming for clarity