Improve a little some ugly code as hell I did I don't remember when.
Last improvments.