fixing reference.
Major Clean up