Some namings
More namings
Come code lines were too long
Extracted the text into resources