Added support for ramp
* Improved formatting