Code cleanup / renaming