Finiashing touches on refactor