Refix and remove prototype

Everything is fine and without prototype... @braiam : I commit it,
please merge if OK!