Some comments and indentation cleanup