Clean code
Merge pull request #119 from juriansluiman/cs-fixes

Clean code