Changes by Alex for style fixes