Adds some simple refactors