Code improvements and request is what it should be :)