Reformated code, now we are using 2 spaces for tabs