More Refactor + simplifcation document