Improve a little things