0.3: Misc code cleanup
0.3: Misc code cleanup