Polishing

 - Polish javadoc for CONNECTED_USER_HEADER
 - Improve method ordering