Tidy up and stuff.

Tidied up the code, and added some small comments.
Entity Class also got planned abit better ( no change yet )