Following code standards

- One statement per line.