Code cleanup and began checking for admin users