cleaned up code / comments