More cleanups to make more extendable