A few improvements :)