A bit faster, remove unused vars, more paddings