Updates for bug fixes and code cleanup
Updates for bug fixes and code cleanup