Reformatted

Reformatted with resharper suggestions and deleted unnecessary comments.