Added suggestions made by @cordoval