fixed few bad smells