17/04/14

code tidying