More comments refactoring

Updated comments for top level container as well as refactored some
methods