Reformat code and start working on Portfolio class