Minor code changes, formaatting.