A little bit of code style clean up. This project really is a mess.