fix bug; reformating