Minor: fmt
Extract method
Minor: fmt
Minor: fmt
Rename method
Fight with generic schizophrenia