Improve code style at places