Added refactors
Moved items over