cleaned up the code significantly
cleaned up the code