add nikhil srinivasan, fix formatting issues