Changed to new coding style

Changed the conflicting files to follow joint coding style.