Cleaned up the code around showing and hiding comments a bit.