Light refactoring; fix formatting issues, misspellings; more unit tests, place holders