Make code more readable, no major changes