Added support for eager evaluation

Also modified the code formatting style