Some tidying up
Some file reader stuff in preparation for controller stuff