Cleaning up and matching convention for solved problems.