Refactors after first three tests