Convert tabs to spaces and cleanup other minor formatting issues