Styling changes
merged style changes
removed asserts