Fixed formatting and names a bit