Cleaner Code/ Authentication(Incomplete)