Refactor .container class, comment/related containers