Edited the template files to more represent my Coding style.