code cleanup, data cleanup [spaces]