styling
fix logic