Small changes to conform with best practice doc