cleaned up code removed extra containers