Fix some of the indentation
Support JEPSO-CI