Updated code style, and changed line ending