Reformatted with scala style guide