Cleaning up code
More code cleanup
Worked on calculating leverage