Some clean up of the code. Removed unused method populateContainer() and added const.