Cleanups, updated with office requirements