Cleaned up the user class
Closes #1 Fixes the build duration time