Agree with you rerefactor, cleaner