Just some constant cleanups, moving them to the top for visibility