Shobiz: code refactor