(maint) Pass lint and cleanup