Skip to content
Some code improvement, mostly for readability.