Cleaned up presentation and added annotations