Further cleanup + test passing