Bump to 1.0.3 and minor code tidy