Comments, minor cleanup