Fix Direction (top level class)

Also remove redundant or useless comments