Minor changes
Refactoring, minor changes
__construct changes