Fixed formatting and minor stuff