Further cleanup and review comments