Updated some coding styles