Completed code clean up for this feature and will merge and create a pull request