Improved variable names/Less code duplication

See the description of my commits. I am curious if this branch can be merged with the master branch, because I am not sure if the branching was executed correctly.