Code cleanup … 

Code cleanup
latest commit 2e964f186d
@sethadam1 authored