Refactor and forget a little thing in last commit ^^