Clean up oxygen protocol method, will hopefully make debugging easier.