Code cleanup.

Just some styling fixes. I changed the file format and name also.