Further improve code style