Some code reorginastion