Some More Clean Up
0.4.0