Improve code coverage & code style