Refactor to allow access of username easily