Fix semantics
Fix styling
Remove logging message
Style tweak