cleared up code aestatics