Cleanups as specified in Issue #27

This cleans up the tree as requested by Issue #27