just formatting changes to make the damn class readable