all: code clean up
Merge pull request #312 from Yahkob/codeCleanup

all: code clean up