misc cleanup (lint + package fix)