format
added xee prevention
cosmetics
code cosmetics