Enhancement: CS fixes

 * license
 * author tags
 * doc blocks
 * new lines
Enhancement: use connect() to simplify the test