Modernization

Change-Id: Ie8dce7c0dc3feb16ac5311d1e3fb88ce5933363a