kinok

Hey @joelegasse, thanks for your relevant review. I agree with all your remarks, just made the changes.

Hey there, Any chance to have a review of this PR? Thank you guys