Cleanup and small extra’s