cleaned up code
cleaned up code 2