Refactoring

by Matthew Waite