Making some style changes as per @irbrad's suggestion.