Minor Fix: Cleaned up comments and coding style a bit.