Minor overhaul of the previous commit