some style fixes
extracting normal and such