tweaked a few things, cleaned up code