NEON-1058 Pulled internet libraries down to local, and some code formatting changes