Some cleanup, getting tests passing