Cleaned up some code around users & dashboard