tabs to spaces, code formatting inproved