removed unused and unnecessary headers, adjusted timeout
improved code consistency
Add the user namespace.