Some refactoring, first day with Saros! Yay!