fixing up code style to match master