Corrected small issues and changed formatting a bit