various style improvements