Liquid assets improvements

Improvements and code clean up

/cc @amitbharadwaj @josemontesdeoca