Code cleanup
Solved problem 131
no message
no message
Solved problem 131