Refactoring
Implemented Settings