pagespeed improved, fixes, indentation