Clean up some semantics
Style tweaks