0.3: Code cleanup