Minor cleanup and style changes