fixed spacing issues and converted all tabs to spaces