Style changes for future

Prepare for the future when deprecated API's are removed.