Fixing spacing/formating issues