PLA-833 Class renamed + code reformat