Wayfinder - Coding style
Wayfinder - Small fix