Finish username and refactory