cleanup

some cleanup to better match the example