Minor cosmetic fixes, rename to user.js