improved source code style