style fixes, comments