Fix user check
Add code comments. Closes #4.