Removed unecessary scopes in Investments
Refactored Investments