Remove reflection, style fixes