Updated /20/12/2013

Tidy up code alittle