style changes by Barnee