Redesinging portfolio calculators.
Clearing some redundant logging.
Adding comments.