Avoid reading system property twice
Merge pull request #6 from a5anka/refactor

Avoid reading system property twice