Style improvements
Quick fix for now