added string formatting, some comments