Tidied up variables a bit
Did some more tidying

Nested the get_x_data functions inside the get_x methods