Code cleanup, renamed module