styling and conventional fixes