Minor cleanup
Reimplemented Enhancement 6