[AR-41] some style edits