Fix blank line in labels, more cleanups