Refactoring

Added Modifiers
Refactoring