cleaned up a touch