Cleaning up problems 1 to 3