Minor keyword changes and bsv specific indentation