typo
Some syntax updates and minor refactoring