Following code style conventions