Minor Changes and Refactoring