Fixed requested changes according to andrew's suggestions.