added comments for further refactoring
fixed display of users list