Tidying up the code to release 1.0.3