My commit from git workshop: Final touchups