Fix mastarm lint
and resulting linting errors
#425
Merged
mastarm lint
and resulting linting errors
#425