Minor cleanup and style fixing