Refactor-ed under advise of the HLint
Added a skeleton for HW5