Refactor according to my new better simpler idea
notes