Readability improvements, modularization preparations due to IO reusability in next HR tasks