Made it a bit more coherent