same task, just cleaned up and in a non-master branch

same task, just cleaned up and in a non-master branch