Refactorings + Tadashi commit