Handled coding convention warnings after merge with master