Fixed several spacing issues