removing unnecessary code, reworking container