0.1.1 Minor code cleanup