Readability and bug fixes
Completed MyRWD part 1