Apply feedback from Pilchie
Apply feedback from CyrusNajmabadi
Missed feedback from CyrusNajmabadi
Apply more feedback from CyrusNajmabadi and AlekseyTs
Apply feedback from AlekseyTs
Apply feedback from jcouv