Added o2 and cleaned up some code