Quick code refinement

Hope it helps! :palm_tree: 

(reinsert comments where necessary!) :P