Some code cleanup / method renaming