Fixed formating and minor errors