mostly cosmetic
More cosmetic edits - removed unnecessary init method