various code style twerks