Cleaned up comments and general format.