Fixed bunch of code formatting issues