Login and readability cleanup