Improved formatting. Support for more syntax.