Minor cleanup and tabs