made sure tests pass, cleaned up whitespace.