some updates
Some code cleanup