Code cleanup / make consistent with README