Added initialization and fixed formatting