changing switches parser and tests
cosmetics
usings organized