Code cleanup and update comments