Reformatted with astyle