peardoc refactoring like a mad men
man I mean :-P