Fixing leading spaces issues and removing some orig files that got added by accident