Code clean-up after splitting code into several modules.