Issue #1: [Cleanup] Indent, spaces and comments
Issue #3: Improve the privilege management