Clened up formatting and names