Cleanup pull request

Cleanup and small corrections