Some comment changes, added one return statement.