Cleaned code, finished user class