Updating build version
Whitespace fix
Fixing reconnect logic
Code style cleanup