Improved indentation.
Change syntax to include slot specs.