Minor cleanup / refactoring