Style cleanup, small refactor
Single quote fixes