Modifications to extract little single use classes out of main script