507: Use body for borders
505: Remove unneeded parens