cleaned up, working a little better