micro fixes
reduce some code