@ertong - standartize code style