cleaning up code
saving info