Removed more stylistic changes