Fixed some coding standar issues