some final cleanup, converting tabs to spaces, etc.