@liggitt Other than the tests I applied all suggestions. Feel free to merge.