fixed some ugliness