Fixing 3 year-old indentation and space problems
More spaces and indetatoin fixes for the old code