Some formatting & code style changes