reformatted code
Made classes internal