attempting to clean up a bit, needs more work