refactoring / syntax cleanup.