Improvements. Thanks @espebra