cleaned up just a bit