layout changes, semi-colons, cleanup