Fixed formatting and initial mistakes