Code Cleanup

Trying my hand at proper code etiquette. I think I got it all straight,
but I'm not certain.  It looks good in notepad++ at least.