fixed whitespace error, tried to clean up names