Refactored magic string into field
Refactorings and code style changes.