Cleaned up ethos.cpp