Added/cleaned up comments