Jan/leading underscores cleaned