[#18] Refactor readers
[#18] Formatting