Refactor, improve readability.
Silence unused variable warninigs