Fix code convintion issue. Some minor improvments.