prefixed and moved container class to helpers