Cleaup refactor no functionality yet