Added separator, some cleanup