Code cleaning :)