cleaned up and changed output