Fixed formatting issues + errors