Issue 128

Code indentation could be improved here.