[ignore] fix code formatting
[ignore] cleanup
[refactor] Make sure to use 'effective' or 'real' user appropriately