Refactoring and other what nots