minor changes to fit my style