Changed method order
Fixed formatting