Cleaning up a bit...

Cleaning up a bit…