Merge "User: Clean up coding style and documentation"