Commenting and making things nicer