Code tidy up.
0.1.3