cleaned up code, weSee done