Cleanup :)

And additional advices, if u want.