fix initialization bug; cleanup