* cleaned up a little bit