WIP: some minor cleanup