Fixed some code styling issues
Updated file headers