Finished feature.
Code tidy-up.