Clean up and finallize login feature