Indention fixes, more perfomance improvements