slight changes to clean stuff up