solved problems 98-100
code cleanup