Clean code
Fix #707 with :poop: