Better tabing
Little better class definitions(camelcase