Reverted some code style changes