REFACTORS FOR FIXBUGS