Code reformat using Stratio conventions