Cleanups and explicit exports