cleanup comma separated var statements

This test seems to violate the style guide. Also fixed typo in ARCHITECTURE.md