indentation, cleanup, texture per view fix