Some kind of cleanup maybe of PHP/HTML separation