Comment cleanup, type capitalization