Some minor cleaning up for Version 0.1.