structuring code to allow further development
made a much more human readable output.