Some minor cleaning up / improvements.