Simplified, removed unimplemented/stub bits
Implemented indent script