Improvements

There are not much code so I guess no comments needed