refactor to simplify
Commit_1
Merge branch 'master' of https://github.com/jaronwilliams/OS161