cleaned up a few functions