Some minor code-styling and -referencing changes

Great work! Tip coming your way :)