ME: code refactor; removed unused objects, renamed objects