Refactors and adds minute updates