Source code cleanup, renaming